From: David Härdeman Date: Tue, 9 Dec 2025 22:49:48 +0000 (+0100) Subject: base-files: always generate default DUID X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=52fa3728e5304ecdfca77332bdfe870696b95d35;p=openwrt%2Fopenwrt.git base-files: always generate default DUID The previous logic was copied from 12_network-generate-ula, but fails to account for upgrades where the "auto" value isn't set (it is set by base-files/files/bin/config_generate). Fix this to always set the default duid if it isn't set. Also, rename the file to better reflect what it does. Closes: #21029 Fixes: a660a076db5a ("base-files: generate a global DHCP DUID") Link: https://github.com/openwrt/openwrt/pull/21118 Signed-off-by: David Härdeman Signed-off-by: Petr Štetiar [fixes,closes tag] --- diff --git a/package/base-files/files/etc/uci-defaults/14_network-generate-clientid b/package/base-files/files/etc/uci-defaults/14_network-generate-clientid deleted file mode 100644 index 11806dd19c..0000000000 --- a/package/base-files/files/etc/uci-defaults/14_network-generate-clientid +++ /dev/null @@ -1,9 +0,0 @@ -[ "$(uci -q get network.globals.dhcp_default_duid)" != "auto" ] && exit 0 - -uci -q batch <<-EOF >/dev/null - # DUID-UUID - RFC6355 - set network.globals.dhcp_default_duid="$(printf '%s%s' '0004' $(cat /proc/sys/kernel/random/uuid | sed -e 's/-//g'))" - commit network -EOF - -exit 0 diff --git a/package/base-files/files/etc/uci-defaults/14_network-generate-duid b/package/base-files/files/etc/uci-defaults/14_network-generate-duid new file mode 100644 index 0000000000..c793dba695 --- /dev/null +++ b/package/base-files/files/etc/uci-defaults/14_network-generate-duid @@ -0,0 +1,9 @@ +[ "$(uci -q get network.globals.dhcp_default_duid || echo "auto")" != "auto" ] && exit 0 + +uci -q batch <<-EOF >/dev/null + # DUID-UUID - RFC6355 + set network.globals.dhcp_default_duid="$(printf '%s%s' '0004' $(cat /proc/sys/kernel/random/uuid | sed -e 's/-//g'))" + commit network +EOF + +exit 0